-
Notifications
You must be signed in to change notification settings - Fork 292
Update feature/perf from master #5766
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update feature/perf from master #5766
Conversation
CP-47655: [Toolstack] - Associate/disassociate VM to/from anti-affinity group Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…ffinity group UT - CP-47304: [Toolstack] - Add data model for anti-affinity group Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…P-47304 CP-47304: Add anti-affinity groups to the datamodel
In VM anti-affinity datamodel PR (xapi-project#5573), there is many-many relation between VMs and VM groups. When changing the VM.groups manually, the VM_group.VMs will be updated automatically. But when removing a VM group, the VM.groups will not be updated automatically. This commit aims to update VM.groups for all VMs in a VM group when it is being removed. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…A-391880 CA-391880: Update related field 'groups' of VM when destroying VM group.
VM in an anti-affinity group will choose a host based on the following steps: 1. If the VM is associated with an anti-affinity group, compute the number of VMs associated with this anti-affinity group for each host. 2. Group these hosts based on the VM's count. The hosts in one group have the same number of VMs in one anti-affinity group. Sort all the host groups ascending based on the VM's count. 3. If a host is the affinity host of this VM, it will be treated as a single host group and be put on the head of the group list. 4. Choose a host randomly which the VM can run on it from each group. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…P-47302 CP-47302: VM start with anti-affinity
Sync master into feature/vm-anti-affinity
When reverting to a snapshot, "groups" needs to be in `do_not_copy` to reserve the latest value of the VM. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…A-392177 CA-392177: Keep current group after reverting from snapshot
Sync master into feature/vm-anti-affinity
Resolve dependency cycling issue if we call Xapi_alerts inside pool_features. Error: dependency cycle between modules in _build/default/ocaml/xapi: Xha_statefile -> Sm -> Sm_exec -> Xapi_session -> Pool_features -> Xapi_vm_group_helpers -> Xapi_alert -> Xapi_http -> Xapi_session Signed-off-by: Lunfan Zhang <Lunfan.Zhang@cloud.com>
The generation of breach alerts during operations on VMs or groups, triggered when all running VMs within a group are breached (i.e., placed on the same host). The following may generate or dismiss alerts: Starting and resuming a VM. Stopping and suspending a VM. Pausing and unpausing a VM. Migrating a VM. Moving a VM from one group to another. Destroying a VM group. Changing the license from Premium to Standard dismisses all breach alerts, while changing from Standard to Premium generates them. In other scenarios, such as when a VM changes state from paused to shutdown, rebooting the VM will not trigger or dismiss alerts. Signed-off-by: Lunfan Zhang <Lunfan.Zhang@cloud.com>
…official/CP-47656 CP-47656 VM anti-affinity generate breach alert
The recommendations are read from files '/etc/xapi.pool-recommendations.d/*' and exposed to clients. They are read-only and only for clients, hence they don't impact the behavior of Xapi directly but only indirectly as they inform a client's behavior. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
The recommendations are read from '/etc/xapi.pool-recommendations.d/*.conf'. When Xapi starts, it will read each file and update the recommendations into the database. If we need to add recommendations to other type objects, e.g. host, VM, etc in the future, just add a similar 'xapi.*-recommendations.d' directory and define the path in xapi_globs. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…P-48570 CP-48570: Load recommendations from config file when Xapi starts
Check feature flag in these places: 1. VM start. 2. Host evacuation. When this PR is raised, the host evacuation PR is still in review. So this PR doesn't include the checking for host evacuation. It will be included in another new PR. 3. Create VM group. 4. VM.set_groups. Adding VMs to a group and removing VMs from a group are all forbidden. If customers need to remove VMs from a group, just destroy the group. 5. Send VM anti-affinity alerts. Also, based on our discussion, the name of feature is changed from `VM_anti_affinity` to `VM_group`. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…P-48011-review CP-48011: XAPI Support anti-affinity feature check
Control domains, templates, and snapshots cannot be added to VM groups. Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
…rom_master Update feature/vm-anti-affinity by merging from master
Add func host_to_vm_count_map to be used, rename RefMap to HostMap Signed-off-by: Gang Ji <gang.ji@citrix.com>
fixup review comments Signed-off-by: Gang Ji <gang.ji@citrix.com>
Signed-off-by: Gang Ji <gang.ji@citrix.com>
…A-393421 CA-393421: Special VMs cannot be added to VM groups
Host evacuation plan with anti-affinity support will be carried out in 3 phases: 1. Try to get a "spread evenly" plan for anti-affinity VMs, done if all the rest VMs got planned using binpack, otherwise continue. 2. Try to get a "no breach" plan for anti-affinity VMs, done if all the rest VMs got planned using binpack, otherwise continue. 3. Carry out a binpack plan ignoring VM anti-affinity. Signed-off-by: Gang Ji <gang.ji@citrix.com>
- Use cbt_enabled flag from plugin responses, to allow that a snapshot of a CBT-enabled VDI will itself be CBT-enabled. - As part of vdi-data-destroy, record the VDI type as a custom key, so that on a subsequent sr-scan it still shows up as a metadata-only snapshot. Signed-off-by: Robin Newton <robin.newton@cloud.com>
Hugo docs: remaining API docs and release info
Signed-off-by: Andrii Sultanov <andrii.sultanov@cloud.com>
Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
equivalents. This allows support to be added to external_certificate_thumbprint_of_master for Sha1 fingerprints. Signed-off-by: Steven Woods <steven.woods@citrix.com>
This code snippet was unchanged since the beginning, but pylint complained: ``` R1720: Unnecessary "else" after "raise", remove the "else" and de-indent the code inside it (no-else-raise) ``` Signed-off-by: Edwin Török <edwin.torok@cloud.com>
Fixes: 500a1f7 ("XenAPI: suppress pytype false positives") Signed-off-by: Edwin Török <edwin.torok@cloud.com>
CI: Complete parallel Coveralls uploads
…-49116 CP-49116: Add Sha1 support to external_certificate_thumbprint_of_master.
Marking this as a draft because quicktests on master are currently broken, once a fix is merged to master this PR will need to be updated. |
Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
Signed-off-by: Bengang Yuan <bengang.yuan@cloud.com>
This reverts commit 31eeb93.
…ivate/asultanov/uri-improvement Revert "CP-49953: Remove parse_uri, switch to using Uri module instead'"
…A-386173 CA-386173: Update the message of WLB authentication issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not clear at the first glance, the changes done is here:
$ git show 2d3bae4ea
commit 2d3bae4ea9fface8bf45a7152f1ee0a17a6a8828
Merge: 84c2ba642 2008661e9
Author: Edwin Török <edwin.torok@cloud.com>
Date: Tue Jul 2 09:39:40 2024 +0100
Merge remote-tracking branch 'upstream/master' into feature/perf
diff --cc dune-project
index 6ebb47f57,3240d722d..f794e59e2
--- a/dune-project
+++ b/dune-project
@@@ -514,16 -524,11 +528,17 @@@ This package provides an Lwt compatibl
(package
(name xapi-stdext-unix)
(synopsis "Xapi's standard library extension, Unix")
+ (authors "Jonathan Ludlam")
(depends
(ocaml (>= 4.12.0))
+ (alcotest :with-test)
base-unix
+ (bisect_ppx :with-test)
(fd-send-recv (>= 2.0.0))
+ fmt
+ (mtime (and (>= 2.0.0) :with-test))
+ (logs :with-test)
+ (qcheck-core (and (>= 0.21.2) :with-test))
(odoc :with-doc)
xapi-backtrace
unix-errno
diff --cc ocaml/libs/clock/dune
index 000000000,009e2ba71..3276c2c08
mode 000000,100644..100644
--- a/ocaml/libs/clock/dune
+++ b/ocaml/libs/clock/dune
@@@ -1,0 -1,20 +1,20 @@@
+ (library
+ (name clock)
+ (public_name clock)
+ (modules date timer)
+ (libraries
+ astring
+ fmt
+ (re_export mtime)
+ mtime.clock.os
+ (re_export ptime)
+ ptime.clock.os
+ )
+ )
+
+ (tests
+ (names test_date test_timer)
+ (package clock)
+ (modules test_date test_timer)
- (libraries alcotest clock fmt mtime ptime qcheck-core qcheck-core.runner)
++ (libraries alcotest clock fmt mtime mtime.clock.os ptime qcheck-core qcheck-core.runner)
+ )
diff --cc ocaml/libs/http-lib/dune
index 3fc174170,1bd993270..ee510d7fc
--- a/ocaml/libs/http-lib/dune
+++ b/ocaml/libs/http-lib/dune
@@@ -42,9 -40,8 +42,10 @@@
(libraries
astring
http_lib
+ ipaddr
polly
threads.posix
++ uri
xapi-log
xapi-stdext-pervasives
xapi-stdext-threads
diff --cc ocaml/xapi/dune
index 131503a22,6575b66ae..d186e1138
--- a/ocaml/xapi/dune
+++ b/ocaml/xapi/dune
@@@ -64,8 -64,7 +64,9 @@@
astring
cstruct
base64
++ clock
cohttp
+ cohttp_posix
domain-name
ezxenstore.core
fmt
And there is another failure not reported in the CI failure in #5760 which requires the change:
diff --git a/ocaml/libs/clock/dune b/ocaml/libs/clock/dune
index 009e2ba717..3276c2c08f 100644
--- a/ocaml/libs/clock/dune
+++ b/ocaml/libs/clock/dune
@@ -16,5 +16,5 @@
(names test_date test_timer)
(package clock)
(modules test_date test_timer)
- (libraries alcotest clock fmt mtime ptime qcheck-core qcheck-core.runner)
+ (libraries alcotest clock fmt mtime mtime.clock.os ptime qcheck-core qcheck-core.runner)
)
File "ocaml/libs/clock/test_timer.ml", line 89, characters 16-35:
89 | let elapsed = Mtime_clock.counter () in
^^^^^^^^^^^^^^^^^^^
Error: Unbound module Mtime_clock
make: *** [check] Error 1
…m-anti-affinity-to-master Merge `feature/vm-anti-affinity` to `master`
Now that anti-affinity is merged, I'll update this PR. Updated. |
This is needed to fix the CI failure in #5760.
More code got pushed to master since last time I merged, and although the branch itself builds fine and passes tests, once merged to master it fails to build (due to missing dependencies on master that happened to work due to transitive dependencies being enabled, but they are disabled on this branch).
The change to get master to work once merged:
This also includes #5761